* .gitignore: Don't ignore .rej files

Left over rejected hunks that we forgot to merge by hand should not be
silently ignored.  Better explicitly remove/rename .rej files when
done with them.

diff --git a/.gitignore b/.gitignore
index e75df8b8b618167b414ee72e31b049a6a10b2377..389fb450d861ff5d4fdf0026db2656b2389cd388 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -251,7 +251,6 @@ gnustmp*
 
 # Version control and locks.
 *.orig
-*.rej
 *.swp
 *~
 .#*